Read geocache type from maggeo file.

diff --git a/csv_util.c b/csv_util.c
index e8a55a8cab3fb4b7a41c8dbc49c11d0c0e96e571..200db154e9d6be8cc23698a022729ef7503b6856 100644 (file)
--- a/csv_util.c
+++ b/csv_util.c
@@ -138,9 +138,6 @@ xcsv_file_t xcsv_file;
 extern char *xcsv_urlbase;
 extern char *prefer_shortnames;
 
-extern geocache_type gs_mktype(const char *t);
-extern geocache_container gs_mkcont(const char *t);
-
 static double pathdist = 0;
 static double oldlon = 999;
 static double oldlat = 999;

diff --git a/defs.h b/defs.h
index ae5fbcb8b87c430abaffdffdd6b3341d7e133518..a857c290f67481eee7e8d0932752f84b402f00ff 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -545,8 +545,11 @@ void xcsv_read_internal_style(const char *style_buf);
 waypoint * find_waypt_by_name(const char *name);
 void waypt_backup(signed int *count, queue **head_bak);
 void waypt_restore(signed int count, queue *head_bak);
+
 geocache_data *waypt_alloc_gc_data(waypoint *wpt);
 int waypt_empty_gc_data(const waypoint *wpt);
+geocache_type gs_mktype(const char *t);
+geocache_container gs_mkcont(const char *t);
 
 route_head *route_head_alloc(void);
 void route_add (waypoint *);

diff --git a/maggeo.c b/maggeo.c
index 4c6d333c805a8a9cb4df4c206456722841eb5feb..abff9a9c9e8fee4b660aac433bd0b08f51546d77 100644 (file)
--- a/maggeo.c
+++ b/maggeo.c
@@ -127,6 +127,7 @@ maggeo_read(void)
                                 gcdata->hint = xstrdup(s);
                                 break;
                     case 12: // cache type
+                                gcdata->type = gs_mktype(s);
                                 break;
                     case 13:    wpt_tmp->creation_time = maggeo_parsedate(s);
                                 break;

diff --git a/unicsv.c b/unicsv.c
index 4c54487d076fcc7abc6c5619954fe9a39ba2b5d9..394c084009a2787c5e4eb3f9c0e73bc2627c577e 100644 (file)
--- a/unicsv.c
+++ b/unicsv.c
@@ -275,9 +275,6 @@ static arglist_t unicsv_args[] = {
        ARG_TERMINATOR };
 
 
-extern geocache_type gs_mktype(const char *t);
-extern geocache_container gs_mkcont(const char *t);
-
 /* helpers */
 
 // #define UNICSV_IS(f) (0 == strcmp(s, f))